From: Jiri Slachta <jiri@slachta.eu>
Date: Tue, 7 Nov 2017 19:07:03 +0000 (+0100)
Subject: rtpproxy: fix build for bcg729 >1.0.1
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=84e65ca0fc24f323a69b6dd97cb6aad0466ccb2c;p=feed%2Ftelephony.git

rtpproxy: fix build for bcg729 >1.0.1

Several method signatures have changed in bcg729 1.0.1
and higher. This issue was already resolved in upstream.
In the current development branch, there is no compilable
version. Due to those changes, I have disabled linking
against bcg729 since we have bcg729 at version 1.0.2.

By disabling bcg729 the internal g729 rtpproxy API
will be used.

Signed-off-by: Jiri Slachta <jiri@slachta.eu>
---

diff --git a/net/rtpproxy/Makefile b/net/rtpproxy/Makefile
index 6f1e796..67046f8 100644
--- a/net/rtpproxy/Makefile
+++ b/net/rtpproxy/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2017 Jiri Slachta <jiri@slachta.eu>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rtpproxy
 PKG_VERSION:=2.0.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/sippy/rtpproxy.git
@@ -23,6 +24,7 @@ PKG_INSTALL:=1
 
 PKG_LICENSE:=BSD-2-Clause
 PKG_LICENSE_FILES:=COPYING
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -35,6 +37,9 @@ define Package/rtpproxy
   URL:=http://www.rtpproxy.org/
 endef
 
+CONFIGURE_VARS += \
+        ac_cv_lib_bcg729_initBcg729EncoderChannel=no
+
 define Package/rtpproxy/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rtpproxy $(1)/usr/bin/